Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 18 Sep 2011 08:39:02 +0000 (01:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 18 Sep 2011 08:39:02 +0000 (01:39 -0700)
commitc019b20f49569cc286b71400edfc35bff768ba06
tree71ff62d4883379cb6570fb5333a06683a8d7f0af
parent783a0b19742b1c8230b61e3244f7a8eb5ba2a972
parent606c34abe5d66bb78e58895f3796274d4d30f64e
Merge from trunk.